Skip to content

chore: extract packages into packages/<name>.nix#2686

Merged
mightyiam merged 2 commits into
molybdenumsoftware:masterfrom
Lymah123:refactor/extract-packages-to-separate-files
Jul 6, 2026
Merged

chore: extract packages into packages/<name>.nix#2686
mightyiam merged 2 commits into
molybdenumsoftware:masterfrom
Lymah123:refactor/extract-packages-to-separate-files

Conversation

@Lymah123

@Lymah123 Lymah123 commented Jul 4, 2026

Copy link
Copy Markdown

Extracts the statix and statix-vim package definitions from overlay.nix into packages/statix.nix and packages/statix-vim.nix respectively, and calls each via callPackage in the overlay.

@Lymah123 Lymah123 marked this pull request as ready for review July 4, 2026 13:08
@Lymah123

Lymah123 commented Jul 4, 2026

Copy link
Copy Markdown
Author

@mightyiam , the PR is ready for review

Comment thread packages/statix-vim.nix Outdated
lib,
}:
let
pluginRoot = ./../vim-plugin;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
pluginRoot = ./../vim-plugin;
pluginRoot = ../vim-plugin;

Comment thread packages/statix.nix Outdated
pname = "statix";
version = "0.6.0-git";
src = lib.fileset.toSource {
root = ./..;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
root = ./..;
root = ../.;

Comment thread packages/statix.nix Outdated
Comment on lines +19 to +20
./../Cargo.lock
./../insta.yaml

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
./../Cargo.lock
./../insta.yaml
../Cargo.lock
../insta.yaml

Comment thread packages/statix.nix Outdated
(file.hasExt "rs")
(file.hasExt "snap")
]
) ./..)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
) ./..)
) ../.)

Comment thread packages/statix.nix Outdated
./../insta.yaml
];
};
cargoLock.lockFile = ./../Cargo.lock;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
cargoLock.lockFile = ./../Cargo.lock;
cargoLock.lockFile = ../Cargo.lock;

Comment thread packages/statix.nix Outdated
meta = {
mainProgram = "statix";
description = "Lints and suggestions for the Nix programming language";
homepage = "https://git.peppe.rs/languages/statix/about";

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
homepage = "https://git.peppe.rs/languages/statix/about";
homepage = "https://github.com/molybdenumsoftware/statix";

Comment thread overlay.nix Outdated
@Lymah123 Lymah123 force-pushed the refactor/extract-packages-to-separate-files branch 2 times, most recently from ab10a33 to 565a43c Compare July 5, 2026 07:48
@Lymah123 Lymah123 requested a review from mightyiam July 5, 2026 07:56
@mightyiam

Copy link
Copy Markdown
Member

I don't think that the first commit is a refactor type commit, because I think refactor type refers to the program itself. What do you think?

@Lymah123

Lymah123 commented Jul 5, 2026

Copy link
Copy Markdown
Author

I don't think that the first commit is a refactor type commit, because I think refactor type refers to the program itself. What do you think?

Agreed, this is flake infrastructure, not a change to the program. Should be chore:.

@Lymah123 Lymah123 force-pushed the refactor/extract-packages-to-separate-files branch from 565a43c to d5cecb2 Compare July 5, 2026 08:37
@Lymah123 Lymah123 changed the title refactor: extract packages into packages/<name>.nix chore: extract packages into packages/<name>.nix Jul 5, 2026
@mightyiam

Copy link
Copy Markdown
Member

The first commit seems to still be of type refactor.

@Lymah123 Lymah123 force-pushed the refactor/extract-packages-to-separate-files branch from d5cecb2 to 014427d Compare July 5, 2026 13:43
@Lymah123

Lymah123 commented Jul 5, 2026

Copy link
Copy Markdown
Author

The first commit seems to still be of type refactor.

Fixed!

@mightyiam mightyiam merged commit 387229b into molybdenumsoftware:master Jul 6, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants